Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup banking bench (backport #24851) #24917

Merged
merged 1 commit into from
May 4, 2022
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 2, 2022

This is an automatic backport of pull request #24851 done by Mergify.
Cherry-pick of e83efe6 has failed:

On branch mergify/bp/v1.10/pr-24851
Your branch is up to date with 'origin/v1.10'.

You are currently cherry-picking commit e83efe678.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   banking-bench/src/main.rs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label May 2, 2022
@mergify mergify bot assigned carllin May 2, 2022
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels May 2, 2022
@mergify
Copy link
Contributor Author

mergify bot commented May 2, 2022

automerge label removed due to a CI failure

Copy link
Contributor

@yhchiang-sol yhchiang-sol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like merge conflicts are not yet being handled.

* Cleanup banking bench

* Fully remove assert
@carllin carllin force-pushed the mergify/bp/v1.10/pr-24851 branch from 24b8ede to 3ebe35f Compare May 4, 2022 17:51
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 4, 2022
@carllin
Copy link
Contributor

carllin commented May 4, 2022

@yhchiang-sol yup, was blocked on backporting #24919. Now that's merged thanks to @taozhu-chicago, this should be a clean merge!

@mergify
Copy link
Contributor Author

mergify bot commented May 4, 2022

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels May 4, 2022
@mergify mergify bot merged commit 762056a into v1.10 May 4, 2022
@codecov
Copy link

codecov bot commented May 4, 2022

Codecov Report

Merging #24917 (3ebe35f) into v1.10 (6a50060) will decrease coverage by 0.0%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##            v1.10   #24917     +/-   ##
=========================================
- Coverage    81.5%    81.5%   -0.1%     
=========================================
  Files         588      588             
  Lines      160624   160624             
=========================================
- Hits       131002   130925     -77     
- Misses      29622    29699     +77     

@mergify mergify bot deleted the mergify/bp/v1.10/pr-24851 branch May 4, 2022 23:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants